f4f0d5e9343ff080ddedda07f8f22f80edfb547e,src/main/java/logbook/internal/gui/BattleDetail.java,BattleDetail,setInfo,#,80

Before Change


                        .append("\n")
                        // 触接
                        .append("味方触接:")
                        .append(Optional.ofNullable(slotitemMst.get(stage1.getTouchPlane().get(0)))
                                .map(SlotitemMst::getName)
                                .orElse("��"))
                        .append("/").append("敵触接:")
                        .append(Optional.ofNullable(slotitemMst.get(stage1.getTouchPlane().get(1)))
                                .map(SlotitemMst::getName)

After Change


        // 味方陣形
        this.fFormation.setText(BattleTypes.Formation.toFormation(this.battle.getFormation().get(0)).toString());
        // 敵陣形
        this.eFormation.setText(BattleTypes.Formation.toFormation(this.battle.getFormation().get(1)).toString());
        // 制空値計
        this.seiku.setText(Integer.toString(ps.getAfterFriend().stream()
                .filter(Objects::nonNull)
                .mapToInt(Ships::airSuperiority)
                .sum()));

        if (this.battle instanceof IKouku) {
            Kouku kouku = ((IKouku) this.battle).getKouku();
            Stage1 stage1 = kouku.getStage1();
            Stage2 stage2 = kouku.getStage2();

            if (stage1 != null) {
                Map<Integer, SlotitemMst> slotitemMst = SlotitemMstCollection.get()
                        .getSlotitemMap();
                // 制空権
                this.dispSeiku.setText(BattleTypes.DispSeiku.toDispSeiku(stage1.getDispSeiku()).toString());
                // 触接
                this.fTouchPlane.setText(Optional.ofNullable(slotitemMst.get(stage1.getTouchPlane().get(0)))
                        .map(SlotitemMst::getName)
                        .orElse("��"));
                this.eTouchPlane.setText(Optional.ofNullable(slotitemMst.get(stage1.getTouchPlane().get(1)))
                        .map(SlotitemMst::getName)
                        .orElse("��"));